From 8bee3e2fe0d907438138327ec807b315aa7b265d Mon Sep 17 00:00:00 2001 From: =?utf8?q?Timm=20B=C3=A4der?= Date: Fri, 5 Jun 2020 06:26:25 +0200 Subject: [PATCH] demos: Avoid shadowing a global from time.h Sad but true. --- demos/gtk-demo/listview_clocks.c | 6 +++--- demos/gtk-demo/listview_weather.c | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/demos/gtk-demo/listview_clocks.c b/demos/gtk-demo/listview_clocks.c index 49108ac280..9b9a399aba 100644 --- a/demos/gtk-demo/listview_clocks.c +++ b/demos/gtk-demo/listview_clocks.c @@ -309,16 +309,16 @@ gtk_clock_init (GtkClock *self) static GtkClock * gtk_clock_new (const char *location, - GTimeZone *timezone) + GTimeZone *_timezone) { GtkClock *result; result = g_object_new (GTK_TYPE_CLOCK, "location", location, - "timezone", timezone, + "timezone", _timezone, NULL); - g_clear_pointer (&timezone, g_time_zone_unref); + g_clear_pointer (&_timezone, g_time_zone_unref); return result; } diff --git a/demos/gtk-demo/listview_weather.c b/demos/gtk-demo/listview_weather.c index 6d8221b36a..ed1ad24dfb 100644 --- a/demos/gtk-demo/listview_weather.c +++ b/demos/gtk-demo/listview_weather.c @@ -78,13 +78,13 @@ gtk_weather_info_new (GDateTime *timestamp, static GDateTime * parse_timestamp (const char *string, - GTimeZone *timezone) + GTimeZone *_timezone) { char *with_seconds; GDateTime *result; with_seconds = g_strconcat (string, ":00", NULL); - result = g_date_time_new_from_iso8601 (with_seconds, timezone); + result = g_date_time_new_from_iso8601 (with_seconds, _timezone); g_free (with_seconds); return result; -- 2.30.2